aofs-10 #379 (aofs-10)