Squashed 'shared/' changes from 61ed716..2f41b94

2f41b94 correct link

git-subtree-dir: shared
git-subtree-split: 2f41b944f82200ecc439c41ac3068369fa494afe
Merge commit 'ef67d3f44ce18008ca3d70d7ab3dafbe27564194' into redesign