Merge t-qpr-2022-12

Change-Id: I033967cb688e3bf315232ee221008960f806c79d