Merge branch 'NIFIREG-176-RC1'