Merge "Bug 5174: Added AutoAttach attributes"