@Si *******
Wait until after 1 Aug and this new amnesty rules comes into play, And then we have to see how immigration is going to enforce the normal pre covid requirements,
Yes, visit after 1 Aug your Immigration Office and ask how they handle this case