Merge "Fix initialization of delta_q_uv"