Topic folding.

Change-Id: If9461bb5b08deabc8093929791c9d895987fd82e