Adding tests for  63216406,62910108 and 61553714
Merge remote-tracking branch 'origin/bugs/properly-handle-documentation-list-shelf-items-61553714' into bugs/properly-handle-documentation-list-shelf-items-61553714