Backport 1.7.9 support to WE 5.x