aofs-07 #468 (aofs-07)