Add persistence id to config.
Merge branch 'devel'