Feature/eva phuc

Change pull request to developer branch.