aofs-07 #501 (aofs-07)