Merge updates for Beta-1 to master