aofs-10 #335 (aofs-10)