Added json actions
Merge branch 'feature/core' into develop