aofs-07 #488 (aofs-07)