Merge t-qpr-2022-12

Change-Id: I68f6328b3e577433b46120dd032414313a84a1b3