fix callback invocation
Merge branch 'data-payload'