BAP-6076: Cr changes