Merge "Speed setting correction to max q estimate."