Merge branch 'issue-1508'