Merge branch 'ravi_dev' into farooq_dev
