Process style to JSON fix
Merge master