Merge "Bump to Beta 04" into lp5.1