Merge branch 'master' into comparable-position