aofs-07 #338 (aofs-07)