Merge branch '2x-thumbnail-images' into develop