Merge remote-tracking branch 'origin/main' into 1035-issue-with-headtracking-in-osba