Merge branch '607-sette-test-failures-from-automatically-generated-architecture-configurations' into 'branch_5.0' ('main') See merge request !861