Merge branch 'main' into 109-harmonize-head-and-orientation-tracking