Merge branch 'idAttribute' into master