Merge "Fixed TOSCA parsing bugs"