aofs-08 #369 (aofs-08)