inline edit without extra layer
Merge remote-tracking branch 'origin/grid' into grid