Prepare for 1.5.5 release
Merge branch 'release/1.5.5' into develop