Resolves CROSSDATA-298