Merge branch 'issue_3784' into develop