optimize of #542 (initalizes $aroot)
Merge branch '2.x' into 2.1