Merge changes from 5.5.x branches into master