Recycler improvements
Tweak
Revert "Tweak"

This reverts commit 6fc4ecf0dd2061ab73cecfdc1bf13266831fefbb.
Revert "Revert "Tweak""

This reverts commit 079cfb607ab3f8dc206280a3ba4e2d721e6ca8f6.