Merge with KS change (event name & desc from get-option), including test case