Most of the work was done in a93c4555, this
commit fixes remaining regressions compared with 5.1.2 release

Fixes #2340