aofs-07 #552 (aofs-07)