Pull bugfix into test branch