am 429cf48e: Merge "CrespoMMS appears after delay in the thread"

* commit '429cf48e2c777cc72925955d7943091b3cf3e181':
  CrespoMMS appears after delay in the thread