SoftDescriptor and SoftDescriptorCity fields added
Merge branch 'master' into stable

merge in for 115 release