Hi Kovoschiz,

Sorry that the changeset 149694862 (https://www.openstreetmap.org/changeset/149694862) was prepared before this changeset so I wish you to take a look on it and advise if anything is wrong.  I tried my best to resolve conflicts though.