Merge "RTD update for delta API 2"