Test for #2055 in develop
fix unlocalized pks in templates
Merge pull request #2063 from yakky/feature/unlocalize_placeholder_pk_30

Unlocalize pks