update several server completion handlers
Merge branch 'dev'