OTT 2.3 intermediate commit, to get edits synced (in new place now)