Merge switch: add timestamps to switch driver