bigelephant29-cherrypick-8.2.0