Bring back patch for roweditior, was mistakenly removed in be4f61d8e19d6c10bc76f771a12dc77bf1bc309b
Merge remote-tracking branch 'origin/master' into functional-tests