Merge branch 'issue_3884' into develop