NXP-14579: backport ES integration including NXP-13655, NXP-13616, NXP-14053, NXP-14113, NXP-14427