Migrated dev/beta changes to beta