MOB-2403 listeners changed to single value events