Merge "Fix ProxyHandler to only run when needed" into klp-dev