Pulled staging updates, preparing to merge