Merge branch 'issue3307' into HEAD

This merges the work for

Issue 3307: Rest positions incorrect with non-standard line count

into master as a single commit since the intermediate changes are not
thoroughly tested (though expected to be incrementally compilable).