pre-v2-merge content changes
move sidebar-first context blocks into sidebar-second