Merge branch 'main' into 1936-fix-non-linearity-fix