Added automatic migration of old event subscription format to the new one
(cherry picked from commit e7088ef)