prepare release 1.5.4-rc1
back to development
Merge branch 'develop' into feature/wms

* develop:
  back to development
  prepare release 1.5.4-rc1