Backport: Improve clearfix
Merge branch '3.0.x'