Updated to GA MS JWT handler