Don't assume there will be always some JSON request to load
Merge branch 'master' into u/ixa1