Merge "Nitrogen branch cutting update"