aofs-07 #421 (aofs-07)