fix
Merge branch 'release-v1.2' of github.com:liqites/warehouse into release-v1.2