Merge "Start of DR API diverge"