Update Fingerprint
Merge branch 'jb-mr1' into HEAD