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