Merge with changes made since before beta 6 build