Revert "Revert "18.4 tùng""

This reverts commit fe17efba32771c5b0630e9ee537dc798eb5d0aaf.