Merge "Adapt zrpcd to work for Carbon/Nitrogen"