disable attrTimer
Merge origin/master