Merge "Simplifying get_delta_q function." into experimental