Fixed json_decode problem in list importing
Merge wit development
Merge branch 'dev/j3/common' into dev/j3/free