Applied latest aesh changes