Minor changes to fix DSC-302 and DSC-728
Merge branch 'master' into nn-reorder-children
Merge pull request #669 from nla/nn-reorder-children

reorder children, merged.
Merge branch 'master' into bulk-refactor