Merge branch 'hotfixes' into devel