Squashed 'STI/' content from commit 576c8d8

git-subtree-dir: STI
git-subtree-split: 576c8d8d79d2f22a09c43438fc4b58d2e2e33d2a
Merge commit '4697c1bd9442a4745a4a3ff13eaa379e3391d827' as 'STI'