fix order panel
Merge branch 'bugfix-1.7' into release-v1.7