planning a merge from ASE into Grapevine