Fixed json binding
Merge