[PATCH 6.6.y 0/2] Apply commit 358de8b4f201 to 6.6.y