Resolves CROSSDATA-288