Merge "BUG-2882: introduce cursor-based modification API" into stable/lithium