aofs-10 #364 (aofs-10)