timob-12176: fix various issues
Merge pull request #4042 from hieupham007/timob-12176

timob-12176: fix various issues