PAHMA-1017: rest of the bits supporting the 'computed vs actual' locations monitoring system