fixes
Merge branch 'contextdata' into beta