Resolves CROSSDATA-123