GDS-1240
GDS-1241
Merge branch 'master' of ssh://github.com/graniteds/graniteds