instserver.patch - sync with upstream