Reapply of KM p/r squashed commits