#117,#118 autoheight improvements