NXP-13805: upgrade to jsf2