Merge "Make the deleteAllKey feature aware of the DSU mode"