am 371b1b61: Backport from master - add crespo and stingray

* commit '371b1b611872c61d09243d974c5993cbe60a1d15':
  Backport from master - add crespo and stingray