Merge t-qpr-2022-12

Change-Id: I4f1c95d9636c9a040ac726c159ce0043d4f46c73