Merge branch 'bug_9914' into 3.12-master