What is the process for converting a non-O visa from Married to Retirement at the Samui office?

My recent experience at Samui office, annual extension of non-O visa, converting from Married to Retirement. May be useful for others?

Smooth sailing, staff very helpful, in and out in a little over 30 minutes.

A couple of points to note:

1. The gatekeeper (info, forms, preliminary check and issue queue number) are now downstairs.

2. Conversion from Married to Retirement requires kor ror 22 (married overseas) or kor ror 2 (married in Thailand) .. 15 minutes and 20 baht at local Amphur office. Presumably a check that you're not on overstay following a divorce for instance. Luckily I'd pre-empted this even though not on the print out.

3. The big surprise .. takes 7 days before you can collect stamped passport .. my recollection is Retirement extension stamp used to be same day .. not sure if this now standard for Retirement extension or if it is specific to the Married to Retirement conversion.