Merge "Support bypassing TLS in the framework" into pi-dev