add custom JSON serializer
change json serializable
Merge remote-tracking branch 'origin/alibranch'