another try to get rid of checkLog.expect
Merge branch 'master' into 3rdPartyUpdate