Sync ordinals with stable branch.