Replace d by dubrovka
Merge branch 'dubrovka' into e_version