Backport IC2 changes.
Backport TiC changes.