update to 5.4-beta-6