OK, good to know - thanks for your help!

Thanks. Actually - a correction, I'm on the Non-B visa, not the Non-O.

Firstly, am I correct in assuming I would need a valid work permit to apply for a new Non-B visa here in Australia? Since this expires the same day as my visa, I don't see how it would be doable without returning to Thailand first. If I did that, would there be any way to apply for a new visa in-country?

Alternatively, if I were to make it to Thailand before Oct 1, but with less than the mandatory 21 days remaining on my visa, is the immigration dept easing any of their rules about granting extensions due to covid? Thanks.