scemas: modify zone
osd::keyboard layout update
Merge remote-tracking branch 'origin/master' into develop