Merge remote-tracking branch 'upstream/main' into implement-headingoffset-headingreset-attributes

Author: keithamus