Merge branch 'fix/wrong-next-key-likes-json' into 'develop'