Merge commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b' * commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b': Avoid pre-processing images when they won't be used
Merge commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b' * commit 'fa8887848e2877dd96e853dfcd52086f1b66c26b': Avoid pre-processing images when they won't be used