Merge branch 'supervisor-order' into 'develop'