Set default domain and address
Merge remote-tracking branch 'origin/point_type'
Merge branch 'point_type'
Merge branch 'master' into point_type