Adds min height to main
Merge branch 'master' into aws