Merge "TOSCA model enhancements"