Merge branch 'develop'
Fixed the order status
Release 1.1.4 stable
Merge branch 'hotfix/1.1.4' into develop