and one fix
Merge branch 'hotfix_fix_schedule_height_script'