Thailand cuts COVID quarantine measures ahead of borders re-opening