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