5.6.x more fixes

Backports and fixes