Merge branch 'release/1.7.0' into develop
Fix for missing poll
Merge branch 'develop'