026.15 tinyg merge - switches and probes - interim commit (does not compile)