aofs-07 #352 (aofs-07)