Fix Bug 945018, add graph elements for signature on demand
Merge pull request #1699 from ossreleasefeed/bug945018-inject-elements-for-graph-tc-as-needed

Fix Bug 945018, add graph elements for signature on demand