I suggest you pay a visit to any of the passport & immigration offices and meet the captain. He will guide you with the updates on the rules, what would apply in your case and how the current situation is being handled.