CA-147681: Fixed by adjusting the layout for JA and ZHCN