Apply RFCs 5633, 5680, 6859