Resolves CROSSDATA-125