Feature/2394 integrate with keymanager