Merge "Update tosca lib"