Adopting the changes from the master repro.