Merge s-mpr-2021-12-05

Change-Id: Ie30e6decc687dd07c62f61760ea1900c619d6ce0