Merge "Reduce server rescue/unrescue times"