Default to JSON
ACT-2027 fix
Merge remote-tracking branch 'remote/master'