#upstream api changes