#10 remove null from inner context node.
Add "/!" according to Rule3: of DataMapping
Merge remote-tracking branch 'shreymehrotra/master'