Merge "Ambient Activation p2.2" into main