PIM-3298 : cleanup edit common attributes scenario