Merge failure on 2022.08.17

Summary

Should fix the conflicts and pipeline failures when merging from upstream on 2022.08.17