Add Area Of Interest
Merge branch 'aoi'
Resolve merge conflicts