Develop

Fix key split so that ";" inside a key will not break it