MOB-2403 empty line fixes