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