aofs-10 #585 (aofs-10)