Merge branch 'bugzilla-10503' into test