1116 review fix extra - excl automatic test