CA-149872 and CA-152873 : Fixed by adjusting the padding for ZHCN