Replicating changes on 622664c