Merge branch 'issue_3943' into develop