[6.15.z] Errata with swidtags setup and modular update

[6.15.z] Errata with swidtags setup and modular update #6409