Merge remote-tracking branch 'asoc/topic/rl6347a' into asoc-rl6347a