Merge pull request #3802 from lambdageek/dev-reference-attr-take3