Fix row header height mismatch in dod
Merge branch 'master' into 1.3