Follow-up: Improve stopping renderer, fix identity template

Follow-up: Improve stopping renderer, fix identity template #8983