Changed to 3S server. Fixed Data Picker.
Merge remote-tracking branch 'origin/master'