Migrate commits from master to main after gitlab transition

Summary

sync commits from master

Steps to reproduce