NXP-11003: Error in synchronization thread: 'timeout' object has no attribute 'code'
Merge branch 'master' into 5.6.0