Merge branch 'devel', v1.07