Merge t-qpr-2022-12

Change-Id: I884d83976f055d047aefbbf38b3e9afa399907a6