Some change for cloud tool setting publish
Merge remote-tracking branch 'rt/master'