Backporting unlisted events functionality from 7.x-3.x

@sherakama plz merge