Merge "Improve temp-table query" into main