SUG-392 : Disable duplicate fields