Merge branch '116-send-delete-event' into 'develop'