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