Merge branch 'fix/unpinnable-polls' into 'develop'