Merge branch 'hotfixes' into 1.2.x