Selective merge from master because sta_a and sta_b are no longer computed.