Release 1.5.4
Merge branch 'release/1.5'