Bump to 5.6.4 and 5.4.36