Merge "Update algorithm support tables for O."