Squashed 'vip/' changes from f39d2a0..a9cdff3

a9cdff3 rename again

git-subtree-dir: vip
git-subtree-split: a9cdff3c749e59f7a6850af6dc696eb52a3cc761
Merge commit '8bfb1ea7bd19ac010b93c241c4a9cc715bfbe9fa'