Updated Root and AFT to latest changes.