Migrate POL from v2.1 to v3

The main discussion is here -