Merge remote-tracking branch 'asoc/topic/core' into tmp