cleanup
merged
Added TimeStampSourceID setting