Merge "Merge "Add detailed fingerprint logging and a historical buffer." into sc-dev am: 9259969bf2 am: c34d0ae087"