Merge branch 'adam' into jm2/devel