Merge "Revert "Temporarily disable test_compare_to_golden"" into main