Merge t-qpr-2022-12

Change-Id: I5d8fcecb3fe66f22d1170219b7a43b87f857cd58