Repair 304 body retention and… — Code review | OneNoughtOne