merge VS HPWH with latest Trunk codes