Add 5.5-current and packer support