aofs-07 #401 (aofs-07)