Merge "Clarifying the KM challenge size" into main