Merge branch 'bug_9923' into 3.12-master