REN-132 Bugfixes and Polygon sharing