NXP-13873: Maintain old implementation compatibility
NXP-13873: Add missing @Override