Merge pull request #7211 from kpayson64/port_server_change_0_14

Port server change 0.14