NXP-11465: tentative fix for random test integration failure
Merge branch 'master' into 5.6.0