Virtual Fence update
Merge branch 'Philip'