Sync commits from master to main

Summary

Some commits were lost from master during the transition to gitlab and main.

Steps to reproduce