[SUITEDEV-2114] merge sonic's pull request