Merge "instrument fingerprint service" into mnc-dr-dev