Fix MAGN-2279 After copy paste CBN does not give error
Merge branch 'ChocoButter-2Become1' into fix_magn2279
Merge pull request #1298 from ke-yu/fix_magn2279

Fix magn2279: After copy paste CBN does not give error but after variable change it does