Merge branch 'lb/contrib-contacts-looser-diff-parsing'