Added custom callback data and capability identifier
Merge pull request #795 from mannol1/master

Added custom callback data and capability identifier