Merge "Fix update_delta_q_probs compile warning" into nextgenv2