aofs-07 #598 (aofs-07)