PIM-2986: Fix issue on edit common attribute scenario