fix sidebar collection namespace
Merge branch '4.1'