Hello,
commit 8b4865cd904650cbed7f2407e653934c621b8127 is marked for backport to stable. The patch does apply cleanly to 6.11.y, but not to earlier versions. In reply to this mail I send a backport for 6.10.y and 6.6.y. The 6.6.y patch also applies to 6.1.y. I didn't test earlier stable branches.
Best regards Uwe