[PPP-3244] / [PPP-11944] - Version check fixes