PIM-3254 : fix versioning cases