Removed old temp_tables header completely.
Merge remote-tracking branch 'origin/master'