O3 WSC to use on un-coded Modules

A few months ago I started to code my MY17 O3 for HBA and hit an issue with an un-initialised module so I backed out.

Now I would like to use a proper WSC combination when I make by second attempt. In my Autoscan all my modules have an importer code of 790 which I assume is the Factory coding tool on the assembly line.

So looking through a scan on my previous 11 plate O2 FL the instrument cluster has a WSC of 73430 031 00098 so is 031 the UK importer number?

I purchased the car (O2 FL) when it was 6 months old - so it looks like the instrument cluster may have had some work before I purchased it, the other modules being 790 like on my O3.

So is that looking like a valid UK dealers WSC and so a good one to use 😊 ?