fixed round corner problem
Merge branch 'release' into develop