Slowdown collapse

Note this is a pull request against 1.6
Should be forward merged/ported later.