Fix: gtemp is not allocated. Due to merge from trunk Fix: temp_sol_add is already allocated. Due to merge from trunk