Merge ltc 1

Merge upstream changes...

leaving this open so someone else looks this over before merging... it's a lot of changes