Manually merge in master branch