Merge "Removes non-incremental update and all related methods" into main