aofs-07 #575 (aofs-07)