Support Thailand
Merge branch 'thailand' into custom