Merge branch 'aeros-cherry-pick' into 'main'