Sync beta and master branches