aofs-07 #601 (aofs-07)