Merge branch 'issue_3873' into develop