Merge t-qpr-2022-12

Change-Id: I4540720950680290f101f6c5e4fde93e6cfb283c