Correcting previous commit to make sure that footprint is inside of extent of generated image.
Adjust tests to previous commit.
Merge branch 'branch-2-0'