- replace older proposed changes for ksu with backports of the changes after review and merging upstream (#1015559, #1026099, #1118347)