Adding RES-10328 and RES-08788