Merge branch 'issue_4093' into hotfix-0.14.1