Merge "Enable json tree dump to work with empty arrays" into devel/master