aofs-07 #638 (aofs-07)