Merge "Cap delta_q_uv to -15..15"