Deferred VAT payments on account

If a company usually makes payments on account for VAT but has deferred the last two under the Coronavirus VAT deferral scheme, would they still only pay over the balancing amount to HMRC with the deferred payments on account being due before 31 March 2021?

In this case, for a VAT quarter ended 30 June, there would normally have been a payment on account on both of 31 May and 30 June with the balancing payment on 31 July. I think that only the balancing amount should be paid on 31 July and the two deferred payments on account should be paid on 31 March 2021. Is this correct?

I had a search for other answers to this and couldn't see one but if anyone can point to a previous discussion that would be great.

Thanks.