Resolves issue CROSSDATA-190