Chages for CF migration
Merge remote-tracking branch 'gooru/master'
Merge pull request #740 from parthibane/master

Changes for CF migration