Merge "fix some material deps" into pi-dev