The same, for the 6.1.x branch