Merge pull request #8821 from remitamine/list-thumbnails-order