Bring in sync with latest tangram developments