Project changes for cherry picking