aofs-07 #431 (aofs-07)