Manage internal loop life cycle

Change-Id: I34c26f3310d04eb60bb51f4123f1e735ec6a66b8