Update KF6 TODO comments to KF7 given that they weren't addressed in KF6
Title is self-explanatory, I can't think of anything else to add in the MR description.
Title is self-explanatory, I can't think of anything else to add in the MR description.