Pull merge (12/28)

Pull merge