aofs-08 #379 (aofs-08)