Resolves CROSSDATA-324