1209 Commits (nc-fix/rollup-fixes)