Merge remote-tracking branch 'origin/feature/json_numeric_check-default-off' into feature/json_numeric_check-default-off