Prevent NullPointerException in MutexAction
Merge branch 'master' into jdbc-optimize