Merge remote-tracking branch 'origin/rfc3961-mic'