Note: This is only done in operation mode strict and for JSON output to avoid breaking older clients.