Squashed 'wicker/' changes from 23dc1eb..92671b7

92671b7 foundational improvements

git-subtree-dir: wicker
git-subtree-split: 92671b7b5b0ede43c6f743bfe1ed7dd70113d9dd
wicker merge
foundational improvements