Merge remote-tracking branch 'upstream/master'
Added dimension type to HCL json
Merge pull request #656 from lev-kuznetsov/master

Added dimension type to HCL json