Add OnRun hook to servenv.
Merge branch 'resharding'