Merge "Revert "Revert "Simplify calling loopers""" into sc-dev