Merge branch 'release/24' into develop
Rename method to be different from column name
Rename field to line spacing
bv
Merge branch 'release/25'