CGIV-1535 Trusty Compatibility