Fix for endless scroll
Merge remote-tracking branch 'origin/MultiSelect' into MultiSelect