Merge "Correcting the image area computation." into sc-dev