rebase from lastest PAC vendor repo, and add missing files