Resolves CROSSDATA-301