aofs-07 #322 (aofs-07)