Split out a device flag file as well
6 files changed