Squashed 'base/' content from commit ba36e0c

git-subtree-dir: base
git-subtree-split: ba36e0c4e23869f3f20fcfeef6f6a9b9cfe26ea6
Merge commit '7e7f8dd54e9dff7ea85786eec7c3d5fb0919fa1f' as 'base'