Merge branch 'issue_4892' into master_tj