am f7e2a2e9: Merge "Management actions, invalidate caches." into klp-dev

* commit 'f7e2a2e96321f56c53cad01a69bd71b281900030':
  Management actions, invalidate caches.