@michaelgzoller, please check this against your pending profile changes.

Also, how do we prevent DRY violations here? Does it make sense to put the exception in the original template rather than cut and paste all the loops here?