026.39 tinyg merge - inspection and cleanup; controller updates