aofs-07 #270 (aofs-07)