Merge commit '742fa575d09272f1e06616fc208a1e08830c8f82' * commit '742fa575d09272f1e06616fc208a1e08830c8f82': fix problems with new image size calculations
Merge commit '742fa575d09272f1e06616fc208a1e08830c8f82' * commit '742fa575d09272f1e06616fc208a1e08830c8f82': fix problems with new image size calculations