Resolves CROSSDATA-308