Applies commit 7a51693. and small changes.
7a51693
It translated on commit 66810c8. so it don't apply changes from commit 17e0489.
66810c8
17e0489