made cp changes
Merge branch 'recovery' into akashBranch