Merge remote-tracking branches 'asoc/topic/simple' and 'asoc/topic/sirf' into asoc...