Not backported to 16.10.x for now as it felt too dangerous (current fix depends on the refactoring of LD performed in 17.x)