Update json patch
Merge branch 'develop'