IF, Azerbaijan is supposedly the next customer of Thunder and they are expecting a delivery soon, that only makes sense about delivery of upgraded Block-II with AESA. Otherwise, PAF has a lot to fulfill its own needs and there is no way for a delivery of Block-III for Azerbaijan by 2022. I assume that any foreign customer interested in Thunder with AESA can get Block-II in new configuration. Furthermore, recent PAF official interview suggests as well that older planes can be upgraded with air cooled AESA etc so one can make a wild guess that foreign customer can take advantage of such an option. Furthermore, PAF itself hasn't received the Block-III which is mostly seen as the top of the strategical asset & front line asset against growing thread from India, may not be exported till next level tech availability.