Restrict node name characters to avoid extra match.
Merge remote-tracking branch 'upstream/stable-develop' into develop