Merge "Skip DE-critical system keys on clearNamespace" into main