Merge branch '5.4' into 5.5