NXP-11074: Fix test
Merge branch 'master' into 5.6.0