Dynamic Naming for Boxed Set

Hi,

I am still on version 16.6 (Windows) and planning on upgrading soon.
I do have a question about Dynamic Naming variables.

So for some time I had been ripping my CD's using this formula for naming which worked fine for compilations with 2, 3 or 4 disc.

[B][IFVALUE]album artist,[album artist],[IFCOMP]Various Artists[][IF!COMP][artist][][]\[album][IFMULTI]\Disc [disc][]\[track] [title][/B]

But now I wanted to re-rip or convert into the following as I noticed I have more Boxed Sets that include complete discographies. I ran into an issue with Toto's All In as it has 12 discs. So the [disc] output is not being padded with 0. So the folder sorting is not coming out right. I used the Boxed Set name as the Album Title and put the actual album name on Comment.

[B][IFVALUE]album artist,[album artist],[IFCOMP]Various Artists[][IF!COMP][artist][][]\[album][IFMULTI]\[disc][] [tag]comment[]\[track] [title][/B]

Does the versions newer than 16.6 have [disc] and [disc_unpadded] just like [track]?

Regards,

D10