Merge beta and stable