Empty data elements style (though implemented in collecting_events, there is no effect on display)
Merge remote-tracking branch 'origin/master'