Should complete #358, #356, #349, #354, #355, #286 Then bump packages and built environment, and push out.
