multi sources video fix II, JSON
Merge branch 'developement' "multi sources video fix II, JSON"