Add back accidentally deleted loop code
Merge remote-tracking branch 'origin/develop' into tg