Merge branch 'main' into jonny/split-sequence-props-tests