Accept deviceid as feedback id type.
Merge branch 'master' into delete-session