aofs-07 #555 (aofs-07)