Version fixes

For some reason there were conflicts, everything that is comitted here
is not done by me, but Maxim Mertz
Revert "Version fixes"

This reverts commit f408c46da0f44b2abdd52ed227923e1bf00faade.