Merge "Opt out test using hidden API from Ravenwood" into main