@klmn: Have you already started the application process? We thought there will be some communication from USCIS about a general extension or some kind of a waiver but it seems we will also start the extension process.

Any other suggestions will be highly appreciated.