Merge branch 'ld/p4-multiple-shelves'