Merge "Support bypassing TLS in the framework"