CROSSDATA-271 resolved