Merge branch 'main' into 109-orientation-tracking-modes