do not modify attributes that are functions
Merge branch 'master' into custom-actions