Pull bugzilla-6687 into test branch