Pull merge (10/28)

Pull merge