Fixes in collection pager block
Merge remote-tracking branch 'origin/master'