added default order to tag
Merge branch 'release-0.8.1' into staging