Initial WL 6.2 upgrade changes