Merge "Fix test failures when NICRefactor flag is enabled" into main