Merge branch 'release/5.5.0'