PIM-3260 : clean edit common attributes