CON-1016

*DO NOT MERGE*
Can we define one handler for those 2 events?