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