PIM-1983 : rename findByWithValues to findOneByWithValues