updated import. thunks mostly
Merge commit 'fa50026' into out_of_sync
Merge commit '655b410' into out_of_sync
merged
Merge commit 'dc34420' into out_of_sync