Merge commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa' * commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa': Fix issue 2152541 thumbnail images stretched.
Merge commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa' * commit 'a6715ca6f9e2125f2ea5db5cf71714e75618e9fa': Fix issue 2152541 thumbnail images stretched.