NXP-9706: Handle most TODOs
Remove irrelevant TODO
Merge branch 'master' into 5.6.0