aofs-08 #377 (aofs-08)