Please don't work on the Master branch. Work on the branch matching the version you want to update (most likely our working branch, new_engine).