aofs-07 #464 (aofs-07)