NXP-9046 after sonar review