[PATCH 6.0 0/1] Request to cherry-pick 3c52c6bb831f to 6.0.y