Merge branch '5.4'