Merge branch 'main' into basop-2388-harmonize-inittnsconfiguration_ivas_fx-and-inittnsconfiguration_fx