Merge branch 'bug_11897' into 'master'