Issue #2707847: Incremental commit. Half working. Non-production yet. Do not use this on a real site.