5.4.1 updates for make allhds/allzhds