merge latest source commits into main device tree