Preparing for merge to beta