Merge "Checking for null proxy object before operating on a method of the proxy object" into tm-qpr-dev