Merge branch 'ib-rockchip' into devel