OptimizeKlConfig fixups

For details please see git commit messages. @veberle @mtr

Merge request reports

Loading