Sync with main

Updated for Release 11.0.0