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