Merge branch 'issue-8710' into develop