e86e0d1ee0
Merge commit '3079afaaf549316483a0f30d22eb157656ca7951' into kraken * commit '3079afaaf549316483a0f30d22eb157656ca7951': Use flattenToShortString instead of toShortString on ComponentNames to