[#76732080] fix compile error
Merge remote-tracking branch 'origin/regRefactorTake2-ian' into regRefactorTake2-ian