Merge branch 'd3/i2c-conflict/dt' into d3/i2c-conflict/merge