I would think the best and logical thing to do is check with Immigration.
Since Covid19 has thrown up a number of issues. Qatar has give us number of provisions for the RP.