Merge "ASM Opt-In flag clean up." into main