0.11.2 stuff

:exclamation: DO NOT MERGE :exclamation:, I'll just push all of this directly, and I still need to amend with the starter kit before that happens.

any last minute feeback? These are the last bits of #2137