Applied latest changes to Aesh