Polygons are saved now
Minor
Merge remote-tracking branch 'origin/develop-avatolsystem' into develop