Merge remote-tracking branches 'asoc/topic/sh', 'asoc/topic/simple', 'asoc/topic...