aofs-09 #379 (aofs-09)