Merge "Precautionary logging to identify  a potential infinite loop." into jb-dev