add support for nem-id
resolve merge conflict
tagging version 7.x-0.11
Merge branch 'release/7.x-0.11' into develop