Merge branch 'issue-1140'