[OE-3987] versioning bugfixes