Merge "Ensure that ProxCheck doesn't run a callback twice." into sc-dev