merge to 2967 in vamp vendor branch