Merge "Convert trex to be Packer compliant"