Merge commit 'b6153173952895441e55d0ff6be332bb7c7605e2' * commit 'b6153173952895441e55d0ff6be332bb7c7605e2': use the max image sizes from the target files zip
Merge commit 'b6153173952895441e55d0ff6be332bb7c7605e2' * commit 'b6153173952895441e55d0ff6be332bb7c7605e2': use the max image sizes from the target files zip