Merge branch 'issue-1043'