aofs-07 #526 (aofs-07)