Merge branch 'bugzilla-11481' into test