Fix build issue
Merge branch 'devel'