Merge branch 'master' into mikhail.golubev/json-preview