Fix (originally wrong) failing unit test due to NXP-12083
Merge branch 'master' into 5.6.0