Merge commit 'HEAD'; branch 'master' into rewrite-sheet