aofs-07 #482 (aofs-07)