aofs-07 #361 (aofs-07)