Merge "Add a little comment about the enabled value" into klp-dev