PIM-2836 Fixed edition of common attributes