Merge branch 'rr/remove-contrib-some' into next