aofs-10 #396 (aofs-10)