Fixed json_decode problem in list importing
Merge branch 'development' into dev/j2/common