Merge "Improve doc for CSM#setGlobalProxy"