aofs-07 #353 (aofs-07)