Merge commit '39b1245' into v3-porting

This commit is contained in:
2022-11-07 08:27:34 -05:00