am 5f86b90b: Merge "Fix issue #10848916: "Always" button is not working." into klp-dev

* commit '5f86b90b8a224e21db89bacf78d4bd4d3f44342d':
  Fix issue #10848916: "Always" button is not working.