Merge "Remove orphaned Calls as part of doUpdate()." into klp-dev