force OPT_SERIALIZER to SERIALIZER_JSON
Merge branch 'develop'