MOB-2444 first commit