Merge branch 'bug_9554' into 3.12-master