Merge branch 'issue-974'