Merge with latest Tantalum

merging with new updates from tantalum. the different platforms are now being developed independently