PIM-3426: Fix edit common attributes