Button height fix
Merge tag '37.1' into develop
Merge branch 'develop'