merged Cheru changes
