Merge branch 'NIFIREG-312-RC1'