Revert "Revert "Integrated GeoFence""

This reverts commit 39798ecd21253a1a1f1770a27b0b225f69686c7f.