aofs-07 #560 (aofs-07)