=per #3774 Persistence activator templates

Rebasing #1990 on behalf of @krasserm