Merge "Temp Table Creation improvements"