Optimize area containment information by using a query with fewer CTEs.
Merge branch 'area-containment-optimize-master' into beta