NXP-12903: backport for 5.6 + add @since