aofs-07 #518 (aofs-07)