Merge t-qpr-2022-12

Change-Id: Ide0d1b67c67efe46d48f4d2073c1b35b3549dcaa