Squashed 'qux/' changes from 284dfef..f2d80f2

f2d80f2 Added v2

git-subtree-dir: qux
git-subtree-split: f2d80f23fd1b98eaa72d7894022b7f50a41f53e3
Merge commit 'cdc819ecc7faddf62aa6b47f8e2ec80e5542e291'