"Hand made merge" with master branch