Merge branch 'bugzilla-11715' into test