NXP-12737: fix random MySQL failure
Merge branch 'master' into 5.6.0