Merge "Performance increase in thumbnail handling"