aofs-07 #444 (aofs-07)