Merge t-qpr-2022-12

Change-Id: I384170d93ca2353e2fef178952694a016b3ecf47