update to T5.4-beta-22