Merge t-qpr-2022-12

Change-Id: I65a11058d99f63f076d994b63d3cfc445033c7df