fix cloud offset
Merge remote-tracking branch 'origin/fix_cloud_offset' into groovy-devel-head