Merge pull request #1 from TwelveBaud/master

Surface more data values in the Template Results window
Block Storage
Merge pull request #1 from McSimp/master

Merge from upstream