Merge branch 'bug_4354' into 3.12-master