Merge branch '5.4-stable'