Merge Alpha 1 changes into dev, as well as some early-added Beta 1 changes
This closes the following: