Resolves CROSSDATA-78