Merge branch 'issue-860'