fix self error
Merge branch 'origin/feature-polling-stacking'