As discussed, will open a defect for java service, as this is issue needs a fix in common class as well