aofs-10 #583 (aofs-10)