Merge "Register replied/forwarded changes to provider"