Preliminary support for InfiniTable.
Merge branch 'infinitable' into develop.