Applied latest Aesh changes