Merge "Changed to use the new hidden API." into main