[PPP-3244] / [PDI-11944] - Version Check Fixes