CDI-3105 minor update