A few more config constants
A batch event framework with controlled property names
Merge remote-tracking branch 'origin/master'