Finished manual merge with master