Jsonplugins2

rebase to the current master