Changed the extent parameter
Merge branch 're_merge'
Merge branch 'master' into develop