merged commits upstream 8/27