Merge "Restore passing of triggering user in edit updates"