Adopt to new incremental modes (incomplete).
Merge branch 'bleeding-jumbo' into memdbg

* bleeding-jumbo:
  Adopt to new incremental modes (incomplete).