Merge branch 'issue_4677' into develop