Hot fix for feature button height
Merge tag '37.1' into develop