Merge t-qpr-2022-12

Change-Id: I65713b81836444663ffbafdf79583f131f0bbcd4