Merge 1.5.5 changes to patch branch.