Fix Rectangle and Group bugs.
Merge remote-tracking branch 'origin/master'
Fix Rectangle and Group bugs.