v1.5.4 log
Merge branch 'release-v1.5.4' into devel