Merge pull request #7436 from davidbz/add_proxy_to_update_procedure