Add to permitted attributes
Merge branch 'fix-permitted-attr' into 2-3-stable