Fixing cross-device bugs
Merge remote-tracking branch 'origin/master'