Merge branch 'issue-510' into develop