Merge branch 'issue-1497'