sync with local changes
Merge with munjeni device tree #7