Merge "Updates to KM4.1"