Pull bugzilla-7349 into test branch