Merge "Add LifecycleOperationStorage and tests"