Merge bedrock work to where it should go into.