aofs-07 #379 (aofs-07)