am 47a8e863: Merge "Fix infinite recursive loop DO NOT MERGE" into jb-mr1.1-dev

* commit '47a8e863e32dc634aa1df79d805f4a366e13d4e9':
  Fix infinite recursive loop DO NOT MERGE