am 15dcebe1: Help fallbacks and intent work

* commit '15dcebe1e79ad396a08873f940e2f33d432cf387':
  Help fallbacks and intent work