backport for NXP-11330 after jQuery Upgrade