Disabling row offsets
Merge branch 'master' into modules/type