Apply 5.4 patch