aofs-10 #428 (aofs-10)