Initial checkin
Merge branch 'polygon-tool' into next-release
Using newer version