Merge branch 'NIFIREG-424-RC1' into main