Reenable comparison example
Merge remote-tracking branch 'origin/master' into callbacks_new
fix for new interface