Improvement for CROSSDATA-190
CROSSDATA-28 resolved