Merge branch 'issue-1597'