Update various assets against 6.4 beta