CRM-13973 : client side behavior improvement