Merge branch 'jn/contrib-remove-diffall'