Merge branch '_getattr'