pull in all phase 1 changes