
Automatic merge from submit-queue (batch tested with PRs 47492, 47542, 46800, 47545, 45764) Fix TPR watches. Fixes #47027 TPR watch has been broken since #44350.
Automatic merge from submit-queue (batch tested with PRs 47492, 47542, 46800, 47545, 45764) Fix TPR watches. Fixes #47027 TPR watch has been broken since #44350.