Merge branch 'ab/drop-contrib-examples'