Merge "Fix tosca parser"