Merge branch 'ss/contrib-subtree-contacts'