Revamp merged events - take #2