@ bin/rebase-db: a bug fixed
Merge branch 'develop'