I entered on a 30, extended for 30, swapped to non O with 20+ days left, and when granted the visa (well before end of the 30-day ext) had to report address same day…. so this was less than 90 days since entering Thailand but would take me to the end of the visa, before year extension.