Preparation for Charm & Combo via JSON-Persistence
Merge remote-tracking branch 'origin/master'