Merge "Make KEY_DSU_SLOT work"