Visa is automatically extended until july 30, for those inside thailand. I have a non-B visa valid until May 2020 but I’m still outside thailand working from home. Will this July extension applicable if I come back to Thailand sometime in May with my original visa already lapsed for say a few days? I plan to extend my visa by then.