Merge "Make Mainline Module update intent explicit" into main