Merge branch 'master' into sanritz
add screen settng
disable cdcyg
Merge branch 'sanritz'