Merge branch 'backport/issue-1296' into 'maint/1.1'