Resolves CROSSDATA-277