Resolves CROSSDATA-297