Added D23 changes for ADP.