Merge branch 'jn/update-contrib-example-merge' into next