Resolves CROSSDATA-300