Merge branch 'jm2/detect2' into jm2/perimeter