Merge branch 'merge-fixes' into devel