regression fix
Merge branch 'devel'