Seperated charms in persistence from special configurations
Merge remote-tracking branch 'origin/master'