Bad comment
Merge remote-tracking branch 'origin/master'
Fixing test crash with setting of the callback.