NXP-13526: adding comments