Merge

new stable point, required for further device folder updates. pushing 319 commits via gerrit is insane, thats why this pull request