Merge remote-tracking branch 'asoc/topic/rt286' into HEAD