Merge branch '5.5' into 6.0