aofs-07 #631 (aofs-07)