Moving things from internal v0.6 branch to v0.5 as it will become relevant sooner rather than later