Merge "Refactor init.environ.rc to append than replace" into main