AOO-416 Recent event in sidebar looks wrong
Merge remote-tracking branch 'origin/master'