CA-153490: Fixed by changing the layout for ZHCN and JA