aofs-10 #574 (aofs-10)