Fixed NullPointerException when <BeginRecordCondition/> not configured
Merge remote-tracking branch 'origin/master'