CerberusException when executing test cases #221
Merge origin/master