Update polly to 0.6.2
Merge branch 'develop' into experimental