[WIP] Merge incremental convert

This is work in progress pull request to merge incremental convert branch.