aofs-07 #532 (aofs-07)