Prepare bubble branch to be merged back into master