Merge branch 'rs/blame-typefix-for-fingerprint'