Beta 7 changes