Device sync (6/20)

Device sync