Changes from AESH 0.41-SNAPSHOT