am 56754193: Merge "Fix cycle detection for SGs." into jb-mr1-dev

* commit '5675419356793a546e58482a51e245ee34500758':
  Fix cycle detection for SGs.