Merge t-qpr-2022-12

Change-Id: I12cde7207f288dfd74cb6881d7a46209a0a009e2