Merge branch 'jd7' into 'develop'

report userid/call integration event id

See merge request !25