merge the changes done in dev_suite to master