1.1 orders logic
Merge branch 'master' into 1.1