Merge in Aahlad server changes