Merge branch 'nz/shared_shelf'