(A1) Common bug fix
Merge branch 'devel'