MOB-2591 classes moved to utils