Merge "Ambient Activation p2.3" into main