Propagated leftover changes from v1.6.x