I’ve re-ported this to ‘main’. It is a very minor fix but I think it is useful to avoid unneeded initializations when using utility code.