Merge branch 'master' into jm2/perimeter