Merge branch 'issue-447' into develop