Merge tag '0.10.4' into develop

Released-0.10.4 0.10.4
use context name of nodes
bumped version
Merge branch 'release/0.10.5'