Delta computation check and slight code cleanup
Merge branch 'core' of github.com:lulingar/frontier-failover into core