aofs-07 #533 (aofs-07)