Merge branch 'issue-1003'